Verilog: ranged always properties #432
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kroening
force-pushed
the
sva_ranged_always
branch
3 times, most recently
from
087a57a to
aa3d47d
Compare
kroening
force-pushed
the
sva_ranged_always
branch
from
aa3d47d to
46f69a6
Compare
tautschnig
approved these changes
Apr 15, 2024
src/trans-word-level/property.cpp
Outdated
Comment on lines
82
to
83
| mp_integer current, | ||
| mp_integer no_timeframes, |
There was a problem hiding this comment.
Given that mp_integer is non-trivial, how about passing those as const references?
src/trans-word-level/property.cpp
Outdated
Comment on lines
131
to
153
| mp_integer from, to; | ||
|
|
||
| auto from_opt = numeric_cast<mp_integer>(range.op0()); | ||
| if(!from_opt.has_value()) | ||
| throw ebmc_errort() << "failed to convert SVA always from index"; | ||
|
|
||
| from = *from_opt; | ||
|
|
||
| if(range.op1().id() == ID_infinity) | ||
| { | ||
| to = no_timeframes - 1; | ||
| } | ||
| else | ||
| { | ||
| auto to_opt = numeric_cast<mp_integer>(range.op1()); | ||
| if(!to_opt.has_value()) | ||
| throw ebmc_errort() << "failed to convert SVA always to index"; | ||
| to = *to_opt; | ||
| } | ||
|
|
||
| for(mp_integer c = from; c <= to; ++c) | ||
| { | ||
| if(c >= 0 && c < no_timeframes) |
There was a problem hiding this comment.
A couple of (related) ideas:
- No need to declare
frombefore it can be initialised. - Taking this one step further, how about:
mp_integer from = std::max(0, *from_opt); - Use
to = std::min(no_timeframes - 1, *to_opt);
These together will avoid unnecessary increments ofcand permit removing theifinside thisforloop.
src/trans-word-level/property.cpp
Outdated
| const exprt &property_expr, | ||
| decision_proceduret &solver, | ||
| std::size_t no_timeframes, | ||
| mp_integer no_timeframes, |
There was a problem hiding this comment.
As above: const mp_integer &?
src/verilog/sva_expr.h
Outdated
| class sva_ranged_always_exprt : public binary_predicate_exprt | ||
| { | ||
| public: | ||
| explicit sva_ranged_always_exprt(binary_exprt range, exprt op) |
src/verilog/sva_expr.h
Outdated
| class sva_s_always_exprt : public binary_predicate_exprt | ||
| { | ||
| public: | ||
| explicit sva_s_always_exprt(binary_exprt range, exprt op) |
Comment on lines
+1595
to
+1604
| #if 0 | ||
| else if(src_type.id() == ID_natural) | ||
| { | ||
| if(dest_type.id()==ID_integer) | ||
| { | ||
| expr = typecast_exprt{expr, dest_type}; | ||
| return; | ||
| } | ||
| } | ||
| #endif |
There was a problem hiding this comment.
Could a comment please be included to explain why this is defined away?
This adds support for always property expressions with a given range and for s_always properties.
kroening
force-pushed
the
sva_ranged_always
branch
from
46f69a6 to
f664e6b
Compare
tautschnig
added a commit
that referenced
this pull request
Apr 15, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds support for
alwaysproperty expressions with a given range.